cssstyleproperty: Get rid of unused API

Both _gtk_css_style_property_print_value() and
_gtk_css_style_property_compute_value() aren't necessary anymore and are
replaced by _gtk_css_value_print() and _gtk_css_value_comptue()
respectively.

diff --git a/gtk/gtkcsscomputedvalues.c b/gtk/gtkcsscomputedvalues.c
index 6f99667f9490b6ee00a9eead7552c801cff3c6c7..caa2251d1b72eb571712ab3d3b9a5dfc78e80c88 100644 (file)
--- a/gtk/gtkcsscomputedvalues.c
+++ b/gtk/gtkcsscomputedvalues.c
@@ -155,10 +155,7 @@ _gtk_css_computed_values_compute_value (GtkCssComputedValues *values,
 
   if (specified)
     {
-      g_ptr_array_index (values->values, id) =
-       _gtk_css_style_property_compute_value (prop,
-                                              context,
-                                              specified);
+      g_ptr_array_index (values->values, id) = _gtk_css_value_compute (specified, id, context);
     }
   else
     {

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 137f3aeca07e682f987a6593df28620cf6f07746..d4a3196a568feb0ce8daa711bfc6310a01e9288e 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -2839,7 +2839,7 @@ gtk_css_ruleset_print (const GtkCssRuleset *ruleset,
           g_string_append (str, "  ");
           g_string_append (str, _gtk_style_property_get_name (GTK_STYLE_PROPERTY (prop->property)));
           g_string_append (str, ": ");
-          _gtk_css_style_property_print_value (prop->property, prop->value, str);
+          _gtk_css_value_print (prop->value, str);
           g_string_append (str, ";\n");
         }
 

diff --git a/gtk/gtkcssstyleproperty.c b/gtk/gtkcssstyleproperty.c
index 8607af52a016e98c7fcf555c70128a166909c78b..98e137d01db92c9dd15b8824eb537eb6a21c00e9 100644 (file)
--- a/gtk/gtkcssstyleproperty.c
+++ b/gtk/gtkcssstyleproperty.c
@@ -226,28 +226,10 @@ gtk_css_style_property_real_parse_value (GtkCssStyleProperty *property,
   return NULL;
 }
 
-static void
-gtk_css_style_property_real_print_value (GtkCssStyleProperty *property,
-                                         const GtkCssValue   *value,
-                                         GString             *string)
-{
-  _gtk_css_value_print (value, string);
-}
-
-static GtkCssValue *
-gtk_css_style_property_real_compute_value (GtkCssStyleProperty *property,
-                                           GtkStyleContext     *context,
-                                           GtkCssValue         *specified)
-{
-  return _gtk_css_value_compute (specified, _gtk_css_style_property_get_id (property), context);
-}
-
 static void
 _gtk_css_style_property_init (GtkCssStyleProperty *property)
 {
   property->parse_value = gtk_css_style_property_real_parse_value;
-  property->print_value = gtk_css_style_property_real_print_value;
-  property->compute_value = gtk_css_style_property_real_compute_value;
 }
 
 /**
@@ -371,52 +353,3 @@ _gtk_css_style_property_get_initial_value (GtkCssStyleProperty *property)
 
   return property->initial_value;
 }
-
-/**
- * _gtk_css_style_property_compute_value:
- * @property: the property
- * @computed: (out): an uninitialized value to be filled with the result
- * @context: the context to use for resolving
- * @specified: the value to compute from
- *
- * Converts the @specified value into the @computed value using the
- * information in @context. This step is explained in detail in
- * <ulink url="http://www.w3.org/TR/css3-cascade/#computed>
- * the CSS documentation</ulink>.
- **/
-GtkCssValue *
-_gtk_css_style_property_compute_value (GtkCssStyleProperty *property,
-                                       GtkStyleContext     *context,
-                                       GtkCssValue         *specified)
-{
-  g_return_val_if_fail (GTK_IS_CSS_STYLE_PROPERTY (property), NULL);
-  g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), NULL);
-
-  return property->compute_value (property, context, specified);
-}
-
-/**
- * _gtk_css_style_property_print_value:
- * @property: the property
- * @value: the value to print
- * @string: the string to print to
- *
- * Prints @value to the given @string in CSS format. The @value must be a
- * valid specified value as parsed using the parse functions or as assigned
- * via _gtk_style_property_assign().
- **/
-void
-_gtk_css_style_property_print_value (GtkCssStyleProperty    *property,
-                                     GtkCssValue            *value,
-                                     GString                *string)
-{
-  g_return_if_fail (GTK_IS_CSS_STYLE_PROPERTY (property));
-  g_return_if_fail (value != NULL);
-  g_return_if_fail (string != NULL);
-
-  if (_gtk_css_value_is_inherit (value) ||
-      _gtk_css_value_is_initial (value))
-    _gtk_css_value_print (value, string);
-  else
-    property->print_value (property, value, string);
-}

diff --git a/gtk/gtkcssstylepropertyprivate.h b/gtk/gtkcssstylepropertyprivate.h
index 093af5f9fcf6ed2b14425f99fb033e85cc5ea5e8..b04b2679a98b2d04d9cb4cb85fb0bb0ae4eb10af 100644 (file)
--- a/gtk/gtkcssstylepropertyprivate.h
+++ b/gtk/gtkcssstylepropertyprivate.h
@@ -36,12 +36,6 @@ typedef struct _GtkCssStylePropertyClass      GtkCssStylePropertyClass;
 
 typedef GtkCssValue *    (* GtkCssStylePropertyParseFunc)  (GtkCssStyleProperty    *property,
                                                             GtkCssParser           *parser);
-typedef void             (* GtkCssStylePropertyPrintFunc)  (GtkCssStyleProperty    *property,
-                                                            const GtkCssValue      *value,
-                                                            GString                *string);
-typedef GtkCssValue  *   (* GtkCssStylePropertyComputeFunc)(GtkCssStyleProperty    *property,
-                                                            GtkStyleContext        *context,
-                                                            GtkCssValue            *specified);
 typedef void             (* GtkCssStylePropertyQueryFunc)  (GtkCssStyleProperty    *property,
                                                             const GtkCssValue      *cssvalue,
                                                             GValue                 *value);
@@ -57,8 +51,6 @@ struct _GtkCssStyleProperty
   guint animated :1;
 
   GtkCssStylePropertyParseFunc parse_value;
-  GtkCssStylePropertyPrintFunc print_value;
-  GtkCssStylePropertyComputeFunc compute_value;
   GtkCssStylePropertyQueryFunc query_value;
   GtkCssStylePropertyAssignFunc assign_value;
 };
@@ -83,10 +75,6 @@ guint                   _gtk_css_style_property_get_id          (GtkCssStyleProp
 GtkCssValue  *          _gtk_css_style_property_get_initial_value
                                                                 (GtkCssStyleProperty    *property);
 
-GtkCssValue *           _gtk_css_style_property_compute_value   (GtkCssStyleProperty    *property,
-                                                                 GtkStyleContext        *context,
-                                                                 GtkCssValue            *specified);
-
 void                    _gtk_css_style_property_print_value     (GtkCssStyleProperty    *property,
                                                                  GtkCssValue            *value,
                                                                  GString                *string);

diff --git a/gtk/gtkcssvalue.c b/gtk/gtkcssvalue.c
index d07a1ca113e0e2873542f39242e59698f5cd9cf7..5d5d39227fdaff5ff457f8d91c11f180c4d44c9b 100644 (file)
--- a/gtk/gtkcssvalue.c
+++ b/gtk/gtkcssvalue.c
@@ -61,6 +61,20 @@ _gtk_css_value_unref (GtkCssValue *value)
   value->class->free (value);
 }
 
+/**
+ * _gtk_css_value_compute:
+ * @value: the value to compute from
+ * @property_id: the ID of the property to compute
+ * @context: the context to use for resolving
+ *
+ * Converts the specified @value into the computed value for the CSS
+ * property given by @property_id using the information in @context.
+ * This step is explained in detail in
+ * <ulink url="http://www.w3.org/TR/css3-cascade/#computed>
+ * the CSS documentation</ulink>.
+ *
+ * Returns: the comptued value
+ **/
 GtkCssValue *
 _gtk_css_value_compute (GtkCssValue     *value,
                         guint            property_id,
@@ -124,6 +138,15 @@ _gtk_css_value_to_string (const GtkCssValue *value)
   return g_string_free (string, FALSE);
 }
 
+/**
+ * _gtk_css_value_print:
+ * @value: the value to print
+ * @string: the string to print to
+ *
+ * Prints @value to the given @string in CSS format. The @value must be a
+ * valid specified value as parsed using the parse functions or as assigned
+ * via _gtk_style_property_assign().
+ **/
 void
 _gtk_css_value_print (const GtkCssValue *value,
                       GString           *string)